s/(enter|leave)_button/$1/g, since pthreads.h no longer conflicts

-Yosh

diff --git a/ChangeLog b/ChangeLog
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f3f0936b681ca9b01f06873357c43d065457c6be..fbe0aa0ef36cb89de78440cb6ca1a611b5ece778 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtkbutton.[ch]
+       * gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
+       no longer conflicts
+       
 Sat Dec 19 01:56:13 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index a833df6fc8aca3b8c3bcbd5005260f58377df121..28e2a57bbb5f8af684457beb783a889165b5ef37 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -160,14 +160,14 @@ gtk_button_class_init (GtkButtonClass *klass)
     gtk_signal_new ("enter",
                     GTK_RUN_FIRST,
                     object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkButtonClass, enter_button),
+                    GTK_SIGNAL_OFFSET (GtkButtonClass, enter),
                     gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   button_signals[LEAVE] =
     gtk_signal_new ("leave",
                     GTK_RUN_FIRST,
                     object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkButtonClass, leave_button),
+                    GTK_SIGNAL_OFFSET (GtkButtonClass, leave),
                     gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
 
@@ -198,8 +198,8 @@ gtk_button_class_init (GtkButtonClass *klass)
   klass->pressed = gtk_real_button_pressed;
   klass->released = gtk_real_button_released;
   klass->clicked = NULL;
-  klass->enter_button = gtk_real_button_enter;
-  klass->leave_button = gtk_real_button_leave;
+  klass->enter = gtk_real_button_enter;
+  klass->leave = gtk_real_button_leave;
 }
 
 static void

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index b6d901a755ac5a3c7163a1ac9584fddb618f161e..8b2fbf673813f7f28da8850dad3eeeb2605fe110 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -56,15 +56,11 @@ struct _GtkButtonClass
 {
   GtkBinClass        parent_class;
   
-  void (* pressed)      (GtkButton *button);
-  void (* released)     (GtkButton *button);
-  void (* clicked)      (GtkButton *button);
-
-  /* these used to be enter and leave, but Digital decided they were more
-     important than us. They may have beaten us for now, but revenge is
-     a dish best served cold */
-  void (* enter_button) (GtkButton *button);
-  void (* leave_button) (GtkButton *button);
+  void (* pressed)  (GtkButton *button);
+  void (* released) (GtkButton *button);
+  void (* clicked)  (GtkButton *button);
+  void (* enter)    (GtkButton *button);
+  void (* leave)    (GtkButton *button);
 };
 
 

diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 3998680ad7690a071c43c59a2132eec750461989..8b6fd6a8819c4bed4635e63e1d7110e7f22fef54 100644 (file)
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -129,8 +129,8 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
   button_class->pressed = gtk_toggle_button_pressed;
   button_class->released = gtk_toggle_button_released;
   button_class->clicked = gtk_toggle_button_clicked;
-  button_class->enter_button = gtk_toggle_button_enter;
-  button_class->leave_button = gtk_toggle_button_leave;
+  button_class->enter = gtk_toggle_button_enter;
+  button_class->leave = gtk_toggle_button_leave;
 
   class->toggled = NULL;
 }